[automerger skipped] [RESTRICT AUTOMERGE] Strip part of the activity info of another uid if no privilege am: 954d2778da -s ours am: 4e9263f456 -s ours am: 7451907617 -s ours am: 6187551d8e -s ours

am skip reason: subject contains skip directive

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

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