[automerger skipped] Merge "Log the application uid in PipUiEventLogger" into rvc-qpr-dev am: 6aba13796f am: 1b48f8a74d -s ours

am skip reason: Change-Id If5d1bfe9ce38ea21bb9e5e13f51622f732dd85b9 with SHA-1 c993b0314b is in history

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

Change-Id: Ibe615bec2dbd799c755bf48d6dc21b772f7a481d