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 qt-dev am: 1d1446d5

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



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