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

Change-Id: I82ff44bf8945c25f93934ce0d66a9d6df79c39c0