[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: 64a1950a -s ours am: 59cec2d3 -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: I89e27091fd63d27f3c69774b00bfe0a8b49cddab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>