Merge "Fix caching flickering for unsecure displays" into sc-dev am: 5a68a6cf am: 149cebde am: 5128af27

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

Change-Id: Ibc0cdad121cd79626e489db4702265b7804269c5