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

Merge "Fix caching flickering for unsecure displays" into sc-dev am: 5a68a6cf am: 37556ff7 am: bc51215a

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

Change-Id: If5e8f24d4bdf6bc032c1240e03114aa3d4a55f76