[automerger skipped] Merge "Revert "[RESTRICT AUTOMERGE] Trim the activity...

[automerger skipped] Merge "Revert "[RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege"" into rvc-dev am: 67904344 am: 5a381979 -s ours am: cd7985e8 -s ours am: 9426948b -s ours am: 97dfc3af -s ours am: 18effe55 -s ours

am skip reason: subject contains skip directive

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



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