[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: c887cbea -s ours

am skip reason: subject contains skip directive

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



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