[automerger skipped] Merge "Trim the activity info of another uid if no...

[automerger skipped] Merge "Trim the activity info of another uid if no privilege" into tm-dev am: 9455c399 -s ours am: bf330747 -s ours am: 16eac836 -s ours am: 03422198 -s ours

am skip reason: Merged-In Ia343ac70e5bb9aeae718fca6674e1ca491a14512 with SHA-1 17df433a is already in history

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



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