[automerger skipped] [RESTRICT AUTOMERGE] Strip part of the activity info of another uid if no privilege am: e74ba32b41 -s ours am: e142ac2822 -s ours

am skip reason: Merged-In I5b6775dd3c4e2ccdacd30741884d336b2eaa70da with SHA-1 dbd1745a61 is already in history

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

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