[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 skip reason: subject contains skip directive

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



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