[automerger skipped] Merge "Cap alpha to max if SAW + FLAG_NOT_TOUCHABLE" am: e521edc4d1 am: 8ac15cacdc am: 99deafe462 -s ours

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

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

Change-Id: Iebc7323ef780cfe219a87f6a125be8119f8cedb8