Merge "Grant client app visibility with UID from activity record" into tm-dev am: 7a1dd2e6

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



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