Merge "Refactoring for AmbientAlwaysOnPreferenceController" into oc-dr1-dev am: 64b15c4a7b
am: 92592b4c25
am: fa0f823f79
Change-Id: I0942e236ae97535b9fdeb6758cb39bea3946e0ad
This commit is contained in: