[automerger skipped] Revert "[RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege" am: 53a76608e5 am: f83968c4c5 -s ours am: 166a094ebf -s ours am: 6379ab13ed -s ours

am skip reason: subject contains skip directive

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

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