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

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

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

Change-Id: I55bc9f04e0b7e6395a58d0d2a9c0e455a5c6cca0