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

[automerger skipped] [DO NOT MERGE] Disable LOCKSCREEN_CUSTOM_CLOCKS in teamfood am: 5bca09e5 am: 02b1df09 -s ours am: 051a8fe5 -s ours

am skip reason: subject contains skip directive

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



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