Merge changes from topic "trusted_overlay_backport" into rvc-dev am: 294e7b87e3

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

Bug: 196389741
Change-Id: I96eb392e3ace659305cccb2773ab715f6cc67eea
Merged-In: I75be2b1d305e22f8a71532b9f5b8ea6c469baaaa