[automerger skipped] Revert "[RESTRICT AUTOMERGE] Trim the activity info of...

[automerger skipped] Revert "[RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege" am: e3247fd5 -s ours am: cbc99ef7 -s ours

am skip reason: subject contains skip directive

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



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