Merge "Fix AdaptiveSleepPreferenceControllerTest." into rvc-dev am: a6760b347c
am: 5a886e51a6
am: 0f34eda3df
Change-Id: I89c623efa1ca4cdeeef9caac463c69cc124bcfa1
This commit is contained in: