Merge changes from topic "trusted_overlay_backport" into rvc-dev am: 58c437f18c am: 88aae2f25f am: 1e2cf25915 am: 7fe98b5ceb

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

Change-Id: Ib72348b80bd4bb500070b76ea329eb68485bf92b