[automerger skipped] [automerged blank] Revert "[RESTRICT AUTOMERGE] Trim the...

[automerger skipped] [automerged blank] Revert "[RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege" 2p: b37e4e7e am: 2e5d7cf6 -s ours am: a190a955 -s ours am: 95e655dc -s ours am: 2c7f3067 -s ours

am skip reason: subject contains skip directive

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



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