Merge "Fix shade flicker & touch absorption" into sc-qpr1-dev am: dbdc35d2ea am: aa0d05423e

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

Change-Id: I9a849af25ce5fab2200fecf87dfb22dfe596cccd