Merge "Testing all the Calling App UID Track Emits" into udc-dev am: 47e7e1a2 am: 84367c83 am: df0d4e2d

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



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