[automerger skipped] Merge "[DO NOT MERGE] Enable Custom LS Clocks in...

[automerger skipped] Merge "[DO NOT MERGE] Enable Custom LS Clocks in Teamfood" into tm-qpr-dev am: ca52e61d am: 46773acc -s ours

am skip reason: subject contains skip directive

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



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