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

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

Change-Id: I48c83881683865b1b9d1de1d4a63531a84112cf6