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