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

[automerger skipped] Revert "[RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege" am: 5caf2dde am: 0523c5c1 -s ours am: f8bec9f6 -s ours am: 11dfc762 -s ours am: 1de91bc1 -s ours

am skip reason: subject contains skip directive

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



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