[automerger skipped] Merge "Revert^2 "Update the summary of AoD when Bedtime...

[automerger skipped] Merge "Revert^2 "Update the summary of AoD when Bedtime mode is on"" into rvc-qpr-dev am: b115ff30 -s ours am: d9b1c33a -s ours

am skip reason: Change-Id Id2511cb0ad93b44f6bf701a707b7ddef9438653d with SHA-1 bca70dd2 is in history

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

Change-Id: I12b02d732004b27c2cdf7fb75d0ba8c24b05de65