[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 rvc-dev am: 5603eb78 am: 421799ac -s ours am: eac1eaf0 -s ours

am skip reason: subject contains skip directive

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



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