Merge "Revert "Trim the activity info of another uid if no privilege"" into...

Merge "Revert "Trim the activity info of another uid if no privilege"" into tm-qpr-dev am: 36993538 am: 9b16d8e4

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



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