Merge "Trim the activity info of another uid if no privilege" into tm-qpr-dev am: 19be85ee

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



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