Merge changes from topic "trusted_overlay_backport" into rvc-dev am: 58c437f18c am: 88aae2f25f am: 1e2cf25915 am: 7fe98b5ceb am: 01459683e3 am: 0f8b1db3e6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15975850 Change-Id: I9ff872b42de843d86a3379bc613f58d8959e9328
This commit is contained in: