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

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

Change-Id: I924be7fc32671c802e47b9bead63af2fe4140f35