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

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



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