This reverts commit 933026a384. - the problem with enabling the developer options is fixed, and hence re-submitting this change. Bug: 73102865 Change-Id: I4f608851df2a4980a6e3766b30c2d86e6e98d94c Test: rebuild
933026a384
383a7d432f
cffe307fa5
7b3c924114
9f16828767
775861bb12
337e2feada
8b35111d3e