tree c341bd44a3c4c86943d0f9be9cd3c120dddc279b
parent 3ed9854390ca18239f95c426b60af8d4434e1092
parent 034a56dab2f9b23cf35388fc72562e1ec9c3a161
author Winson Chung <winsonc@google.com> 1636660756 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1636660756 +0000

Merge changes from topic "trusted_overlay_backport" into rvc-dev am: 58c437f18c am: f986999eec am: 24304ff554 am: 034a56dab2

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

Change-Id: Ibd2ff0a3a4f326cd01c9526eb8b1b6ea6fce9d8e