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

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

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



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