Merge "Refactoring for AmbientAlwaysOnPreferenceController" into oc-dr1-dev am: 64b15c4a7b am: 6eafaf46aa
am: d4d55b73ad

Change-Id: I5cbad3a82c0bc68453034cd00d7e184b97c965a6