[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-dev am: 69080869 -s ours

am skip reason: Merged-In I5b6775dd3c4e2ccdacd30741884d336b2eaa70da with SHA-1 954d2778 is already in history

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



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