Merge "Revert^2 "Update the summary of AoD when Bedtime mode is on"" into rvc-qpr-dev