[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: f77eb29a -s ours am: 7c27e2d4 -s ours am: 8750279f -s ours am: 8af3a896 -s ours

am skip reason: subject contains skip directive

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



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