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

[automerger skipped] Merge "Revert "Trim the activity info of another uid if no privilege"" into tm-dev am: 3d96cd6e -s ours am: 0fb3ef55 -s ours am: 12f428cb -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: If3c3110031ae04df59ed4e488714d187638d801a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>