[automerger skipped] Merge "[RESTRICT AUTOMERGE] Strip part of the activity info of another uid if no privilege" into sc-qpr1-dev am: fd612ab925 -s ours am: af4e6aa026 -s ours am: 29721b7ee3 -s ours am: b597fb07aa -s ours

am skip reason: subject contains skip directive

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

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