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

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

Change-Id: Id075b3637bf193480304eed468c008907e7d0c05