Merge "Fix shade flicker & touch absorption" into sc-dev am: 85978872b9 am: c90dba8c70

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

Change-Id: Ic82ab02a13863d2865b42f4a9913561f6dd71000