Merge "Fix WhenToDreamPreferenceControllerTest" into tm-dev am: fdd48399d9
am: 53e410b4e9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17158224 Change-Id: I7cdbb646a1d9479c422e5bf0f1a361b1a4bec5b0
This commit is contained in: