[automerger skipped] [RESTRICT AUTOMERGE] Strip part of the activity info of another uid if no privilege am: 7be9e6efb6 -s ours

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

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

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