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

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

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

Change-Id: I587ecdea602390d060d18cb8dd4a14edbade7074