[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: 53a76608 am: f83968c4 -s ours am: 166a094e -s ours am: 6379ab13 -s ours am: e0fdb379 -s ours

am skip reason: subject contains skip directive

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



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