Merge "Fix AdaptiveSleepPreferenceControllerTest." into rvc-dev am: a6760b347c
am: 0e4b3e2d03
am: 8681e4fd57
am: dfb634ddcf
Change-Id: I59299ed04c804f12ddd1e0dfd1700647d6c861d2
This commit is contained in: