[automerger skipped] Merge changes from topic "untrusted-cap" into...

[automerger skipped] Merge changes from topic "untrusted-cap" into sc-v2-dev-plus-aosp am: ed8d74bc -s ours am: 04a97965 -s ours

am skip reason: Merged-In I3a74e1cc43a36171ee10fbf68c4bfff538eee661 with SHA-1 f9c9ddfb is already in history

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



Change-Id: Ibdf61628cf30eda2d16dca39ad12b4731a657062
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>