[automerger skipped] Merge "[RESTRICT AUTOMERGE] Trim the activity info of...

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege" into sc-dev am: 8c8286d8 -s ours am: 1555f848 -s ours am: ef974b5a -s ours am: 896cfa82 -s ours

am skip reason: subject contains skip directive

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



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