Merge "Add flag of Transit Clock for picker" into udc-qpr-dev am: 11b85acc

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



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