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

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege" into qt-dev am: 191036a9 am: 70536c01 -s ours am: bdf427e3 -s ours am: b4b3e027 -s ours

am skip reason: subject contains skip directive

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



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