[automerger skipped] Merge "Disable Clock View Layer and ignore assigned alpha" into udc-dev am: f31d364775 am: 3cb5c235df -s ours am: 8b5d9cfcfe -s ours am: 348746140a -s ours
am skip reason: Merged-In I7f4813673cc6b61d7bc93d4984500c19bce41936 with SHA-1 d1d45d4c31 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24081607
Change-Id: I3d34597b0d1ecbce9b2172845b2cc01dfab11643
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: