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

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

Change-Id: Idc5fbaedb9a212b0bad414da6630f798248a6e04