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

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

Change-Id: I68e9cb9419efdf9a88f636a53261fdf6e16baf6f