Merge changes from topic "trusted_overlay_backport" into rvc-dev am: 58c437f1 am: 88aae2f2 am: 1e2cf259

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

Change-Id: I6889aaa7d520728ef745bac09381d266f6fc6de3