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

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



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