[automerger skipped] Merge changes from topic "trusted_overlay_backport" into...

[automerger skipped] Merge changes from topic "trusted_overlay_backport" into rvc-dev am: 294e7b87 am: 90b88a97 -s ours am: cb154678 -s ours am: dae1a991 -s ours

am skip reason: Merged-In I75be2b1d305e22f8a71532b9f5b8ea6c469baaaa with SHA-1 41f48c7b is already in history

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

Change-Id: I8fbf490d4aa9c0091a4b9755e3d4f8470bbabe06