[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 skip reason: subject contains skip directive

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



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