Merge changes from topic "trusted_overlay_backport" into rvc-dev am: 58c437f18c

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

Change-Id: Ic21fa531902e2144fe187c6170079e46d49ad235