[automerger skipped] Merge "[DO NOT MERGE] Disable LOCKSCREEN_CUSTOM_CLOCKS in...

[automerger skipped] Merge "[DO NOT MERGE] Disable LOCKSCREEN_CUSTOM_CLOCKS in teamfood" into tm-qpr-dev am: 6e1228cd am: 3b98c73d -s ours am: 010b989e -s ours

am skip reason: subject contains skip directive

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



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