Merge "Resolve subtle but severe flickering in layer caching" into sc-dev am: 3cca855919

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

Change-Id: I63971f3ce17a8702b5e7fbc98e311019e4145761