[automerger skipped] Merge "Cap alpha to max if SAW + FLAG_NOT_TOUCHABLE" into sc-v2-dev am: 5bc80b693d -s ours am: 28edb92e7a -s ours am: 4e9903c3f6 -s ours
am skip reason: Merged-In I3a74e1cc43a36171ee10fbf68c4bfff538eee661 with SHA-1 a451d5bae2 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17071470
Change-Id: Ica176b766cbafc84ca070bf4902730ff92d4b290
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: