[automerged blank] Revert "[RESTRICT AUTOMERGE] Trim the activity info of...

[automerged blank] Revert "[RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege" 2p: b37e4e7e

Blank merge reason: Change-Id Ia343ac70e5bb9aeae718fca6674e1ca491a14512 with SHA-1 17df433a is in history

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

Bug: 264269392
Change-Id: Ie1e75280585d426aac371337636e84d59704b512