Merge "Resolve subtle but severe flickering in layer caching" into sc-dev am: 3cca8559 am: 70280e7e am: c5b6adf6

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

Change-Id: I3789407aea5b1b3dda352b20c0e0d377e5ffcc9a