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

[automerger skipped] Revert "[RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege" am: 53a76608 am: f83968c4 -s ours

am skip reason: subject contains skip directive

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



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