Merge changes from topic "transit_clock_flag" into udc-qpr-dev am: 02702cc2

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



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