Merge "Update custom clock flag to a resource" into udc-dev am: 3090ffdc am:...

Merge "Update custom clock flag to a resource" into udc-dev am: 3090ffdc am: 12e541f4 am: 28418a59

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



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