[automerger skipped] Merge "String change to highlight calculation stopped at...

[automerger skipped] Merge "String change to highlight calculation stopped at last even hour" into tm-qpr-dev am: 6aba1663 -s ours am: 18d5ebc3 -s ours

am skip reason: Merged-In Ia08dea791bb72113719fd1316e8e9587a96eaef1 with SHA-1 3d7b8b3b is already in history

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



Change-Id: I2dc70d83faa0bb2c145266367bd6ddb3cf572408
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>