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

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

Change-Id: Iece392d4925c788431ca5365a3c48e04bb9aae76