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

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

Change-Id: Ib8c1874882dd1b578c9301958b22c2fbc2994081