[automerger skipped] Merge "Cap alpha to max if SAW + FLAG_NOT_TOUCHABLE" into...

[automerger skipped] Merge "Cap alpha to max if SAW + FLAG_NOT_TOUCHABLE" into sc-v2-dev am: 5bc80b69 -s ours am: 28edb92e -s ours am: 4e9903c3 -s ours

am skip reason: Merged-In I3a74e1cc43a36171ee10fbf68c4bfff538eee661 with SHA-1 a451d5ba 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>