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

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

Change-Id: I5398f7f9b896a7207f2e8ec4d9becd96f6ca0298