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

[automerger skipped] Merge "Cap alpha to max if SAW + FLAG_NOT_TOUCHABLE" am: e521edc4 am: 8ac15cac am: 99deafe4 -s ours am: 865379bc -s ours

am skip reason: Merged-In I3a74e1cc43a36171ee10fbf68c4bfff538eee661 with SHA-1 f9c9ddfb is already in history

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

Change-Id: I8a81d0973741c491236a6763c86f4a285b0e992b