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

am skip reason: subject contains skip directive

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

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