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

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



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