Merge "Strip part of the activity info of another uid if no privilege" into...

Merge "Strip part of the activity info of another uid if no privilege" into tm-qpr-dev am: db0f714e am: adb5f9c8

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



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