Merge "[RESTRICT AUTOMERGE] Strip part of the activity info of another uid if no privilege" into rvc-dev am: 5603eb78f1

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

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