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