[automerger skipped] Merge "Disable Clock View Layer and ignore assigned alpha" into udc-dev am: f31d364775 am: c88e4605a8 -s ours am: b7913344b9 -s ours am: 9d75526956 -s ours

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

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

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