Merge "[RESTRICT AUTOMERGE] Trim the activity info of another uid if no...

Merge "[RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege" into rvc-dev am: 8038ab14

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



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