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

[automerger skipped] Merge "Revert "[RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege"" into sc-v2-dev am: 27b3d9fc -s ours am: 92393e34 -s ours am: d1383616 -s ours am: 4019346c -s ours am: 67980242 -s ours

am skip reason: subject contains skip directive

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



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