[automerger skipped] Merge "[RESTRICT AUTOMERGE] Strip part of the activity info of another uid if no privilege" into sc-dev am: 69080869a1 -s ours am: f77eb29aca -s ours am: 7c27e2d431 -s ours am: 8750279f33 -s ours am: 3b16a9f295 -s ours

am skip reason: subject contains skip directive

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

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