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

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



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