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: 6a782d92
* commit '6a782d92':
Fix Developer options appears after first boot, disappers on Settings Menu Reload
Change-Id: I5840c18389d1dbcd6bb2a8121ddf4ad3302548fc