Merge "Only match identical userIDs for autogroup summaries" into udc-dev am: 28c0cec7

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



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