[automerger skipped] Merge changes from topic "trusted_overlay_backport" into rvc-dev am: 294e7b87e3 am: 90b88a978e -s ours am: cb15467837 -s ours

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

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

Change-Id: Icc066e6ffcaf7ecb0b5a3e7563f038e824fb19f5