Merge "Merge "Fix Developer options appears after first boot, disappers on Settings Menu Reload" into nyc-dev am: 81c03dc
am: 6a782d9" into nyc-mr1-dev-plus-aosp
am: b396a08
* commit 'b396a0897e0f55de254e12179d75c38ea53fb896':
Change-Id: I095c7133f26e03eac670689f2833f9b2625924ca
This commit is contained in: