[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 skip reason: Merged-In I5b6775dd3c4e2ccdacd30741884d336b2eaa70da with SHA-1 dbd1745a is already in history

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



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