Merge "Fix component query/binding for multiuser" into udc-dev am: 6ade6d1d

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telecomm/+/23603429



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