Merge "Trim the activity info of another uid if no privilege" into tm-qpr-dev...

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

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



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