Merge "Fix shade flicker & touch absorption" into sc-dev am: 85978872 am: c821fffe am: 02777263

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

Change-Id: I1a02ef52da406f69b285151d6fef1dfdb765b342