Merge "Fix WhenToDreamPickerTest and re-enable." into tm-dev am: 9ceec097b1 am: 17213596a7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17123847 Change-Id: Ib43245f0cd363bbe3b47c188d06dc843efa2b278
This commit is contained in: