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

Merge changes from topic "trusted_overlay_backport" into rvc-dev am: 294e7b87 am: e93bd774 am: f13c6285 am: 7c2f24b2

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

Change-Id: I28025893f506121b09cd83d0fec20ad77d423c18