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

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

Change-Id: I7b935c632f337817590d96873a0714461a50d416