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

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

Change-Id: Ie02e06debb04c809ccbd8a166c0e545b1fa8dba1