Merge "Fix caching flickering for unsecure displays" into sc-dev am: 5a68a6cfe0

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

Change-Id: I88491a5dbce1aa49183da38064881e5a0d85b8a4