[automerger skipped] Merge "Revert "[RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege"" into rvc-dev am: 6790434470 am: 5a38197914 -s ours am: cd7985e8f8 -s ours am: 9426948b40 -s ours

am skip reason: subject contains skip directive

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

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