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

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

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

Change-Id: Ibd2ff0a3a4f326cd01c9526eb8b1b6ea6fce9d8e