[automerger skipped] Merge "[RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege" into sc-dev am: 8c8286d8fe -s ours am: 1555f848d5 -s ours am: ef974b5a0a -s ours am: 896cfa8292 -s ours

am skip reason: subject contains skip directive

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

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