Merge "Cap alpha to max if SAW + FLAG_NOT_TOUCHABLE" am: e521edc4d1 am: 8ac15cacdc

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

Change-Id: I57462c7c36aa1a7c22013ec123f8a26e9df2dfde