Merge "String change to highlight calculation stopped at last even hour" into...

Merge "String change to highlight calculation stopped at last even hour" into tm-qpr-dev am: 6aba1663

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



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