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

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

Change-Id: I9f1c84f23a8a81a2e33079776ed9204263327b4b