Merge "Merge "Fix Developer options appears after first boot, disappers on...
Merge "Merge "Fix Developer options appears after first boot, disappers on Settings Menu Reload" into nyc-dev am: 81c03dc3 am: 6a782d92" into nyc-mr1-dev-plus-aosp
am: b396a089
* commit 'b396a089':
Change-Id: I095c7133f26e03eac670689f2833f9b2625924ca