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