Merge "lockscreen_custom_transit_clock - Enable teamfood" into udc-qpr-dev am: 1d2f16e535 am: 8a855315c8

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

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