[automerger skipped] Merge "Disable Clock View Layer and ignore assigned...

[automerger skipped] Merge "Disable Clock View Layer and ignore assigned alpha" into udc-dev am: f31d3647 am: c88e4605 -s ours

am skip reason: Merged-In I7f4813673cc6b61d7bc93d4984500c19bce41936 with SHA-1 58959585 is already in history

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



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