[automerger skipped] Merge "[RESTRICT AUTOMERGE] Strip part of the activity...

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Strip part of the activity info of another uid if no privilege" into sc-qpr1-dev am: fd612ab9 -s ours am: af4e6aa0 -s ours am: 29721b7e -s ours am: e6c1ce12 -s ours

am skip reason: subject contains skip directive

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



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