Merge changes from topic "trusted_overlay_backport" into rvc-dev am: 58c437f18c am: f986999eec am: 24304ff554 am: 034a56dab2 am: 73abbf7ac1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15975850 Change-Id: I9b1e57a71c42ec2e09b2c93704c9f78018c24be0
This commit is contained in: