Merge "Revert "[RESTRICT AUTOMERGE] Trim the activity info of another uid if...

Merge "Revert "[RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege"" into rvc-dev am: 67904344

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



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