[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: e93bd774 am: f13c6285 am: 2bf258a4 -s ours

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

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

Change-Id: Ib349b8efbd93827b98448b73afc081a7e36ecea0