Merge "Update clock location" into sc-v2-dev am: bda966d4d0 am: b4f39650a9

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16457712

Change-Id: I551726bc137a67472f5e7c7a06860e0810c014db