[automerger skipped] Trim the activity info of another uid if no privilege am:...

[automerger skipped] Trim the activity info of another uid if no privilege am: b01460d5 -s ours am: 4b38eb97 -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: I444878b2705150d12980d28b36d769b2fc973162
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>