[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 skip reason: Merged-In Ia343ac70e5bb9aeae718fca6674e1ca491a14512 with SHA-1 fa8d6362 is already in history

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



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