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

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

Change-Id: I80e4cdc12d6ae563050ad393055a72e59ab3e8a9