Merge "Fix WhenToDreamPickerTest and re-enable." into tm-dev am: 9ceec097b1

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17123847

Change-Id: Ia1d5a6a6c3331366505d471ce00fa730c98a6490