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