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

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

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

Change-Id: Ic21a391b63f023d622ed70618e0b8556ed5c2f21