[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: 4a9eddc505 -s ours am: 5f4deca9d5 -s ours

am skip reason: subject contains skip directive

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

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