[automerger skipped] Merge "Grant client app visibility with UID from activity record" into tm-dev am: 7a1dd2e6 am: ac7d47c9 -s ours

am skip reason: Merged-In Ibe20fb4da91fa80f8539bb19c90515167bf6e85b with SHA-1 d2b102f0 is already in history

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



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