[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 tm-dev am: 906c4c76 -s ours am: 488ff1ec -s ours am: cdbb0cc6 -s ours am: 33432c86 -s ours

am skip reason: subject contains skip directive

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



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