[automerger skipped] [RESTRICT AUTOMERGE] Strip part of the activity info of another uid if no privilege am: e534fa2a71 am: 4e1498ac5d -s ours am: abc8ae3dba -s ours am: 17a567eb38 -s ours am: 725dc5a509 -s ours

am skip reason: subject contains skip directive

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

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