[automerger skipped] Merge "[RESTRICT AUTOMERGE] Strip part of the activity info of another uid if no privilege" into rvc-dev am: 5603eb78f1 am: 421799ac5e -s ours am: eac1eaf072 -s ours am: d380b594b4 -s ours am: 2053ab8cc5 -s ours am: 9fe7a0a9b9 -s ours

am skip reason: subject contains skip directive

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

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