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

[automerger skipped] Merge "Revert "[RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege"" into sc-dev am: b9319ef7 -s ours

am skip reason: Merged-In Ia343ac70e5bb9aeae718fca6674e1ca491a14512 with SHA-1 17df433a is already in history. Merged-In was found from reverted change.

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

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



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