Merge "Fix Developer options appears after first boot, disappers on Settings...
Merge "Fix Developer options appears after first boot, disappers on Settings Menu Reload" into nyc-dev am: 81c03dc3 am: 38ee923a
am: 83ff72cd
* commit '83ff72cd':
Fix Developer options appears after first boot, disappers on Settings Menu Reload
Change-Id: Ibe735f3be61cc1b6ceb8a30e9060dc3d8dc9eefc