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

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



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