Merge changes from topic "trusted_overlay_backport" into rvc-dev am: 58c437f1 am: f986999e am: 24304ff5

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

Change-Id: I6dedcabd8fe30ed0052da540ce1e56dea1476410