Merge "Merge "Fixes incorrect settings usages in AdaptiveSleepPreferenceController" into rvc-dev am: d20ca89728
am: 64f8f95178" into rvc-d1-dev-plus-aosp am: 79dc71bdfc
am: 03bea8f0e0
Change-Id: Iee7361cc1325154d8971aaeb556a7ebd2212cd23
This commit is contained in: