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

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

Change-Id: Ib3d99af7242edff61dc29750bc2ec0036a513c9d