[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 qt-dev am: 1d1446d5 am: 438e63bc -s ours am: a7dce649 -s ours am: 3abf3b4e -s ours am: e96853e7 -s ours

am skip reason: subject contains skip directive

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



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