[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 skip reason: subject contains skip directive

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



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