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: I74bb83aed7b5d910edc381314635ea3df71b8c88