[automerger skipped] Merge "Only match identical userIDs for autogroup summaries" into udc-dev am: 28c0cec7c4 am: 76c4062867 -s ours

am skip reason: Merged-In Ia4b1bf695299ac8f698a534e1b1a32a483db968b with SHA-1 2fbdda59dd is already in history

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

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