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