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

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

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



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