Merge changes from topic "trusted_overlay_backport" into rvc-dev am: 58c437f1 am: 88aae2f2 am: 1e2cf259 am: 7fe98b5c am: 01459683 am: 0f8b1db3

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

Change-Id: I9ff872b42de843d86a3379bc613f58d8959e9328