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: cbd8850d am: bf5a1c04

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



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