[automerger skipped] Merge "[RESTRICT AUTOMERGE] Trim the activity info of...

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege" into rvc-dev am: 8038ab14 am: e8f11f89 -s ours am: 911725a3 -s ours am: e3a5eed1 -s ours am: 9810b6ef -s ours am: fa32a518 -s ours

am skip reason: subject contains skip directive

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



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