[automerger skipped] Revert "Trim the activity info of another uid if no...

[automerger skipped] Revert "Trim the activity info of another uid if no privilege" am: 10c5e2a6 -s ours am: ab9ae86b -s ours

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

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



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