[automerger skipped] Merge "[RESTRICT AUTOMERGE] Strip part of the activity...

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Strip part of the activity info of another uid if no privilege" into sc-v2-dev am: ad44eb52 -s ours am: 51775506 -s ours am: 6b47962c -s ours am: 5cede941 -s ours

am skip reason: subject contains skip directive

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



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