[automerger skipped] [RESTRICT AUTOMERGE] Strip part of the activity info of another uid if no privilege am: dbd1745a61 -s ours am: b3bcb8ac95 -s ours am: 5c4e538fcc -s ours

am skip reason: subject contains skip directive

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

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