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

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

Change-Id: I6ef254e63cf1111b3398d5ce4e00ed532c35c9f7