Merge "Use component info to bind Mock Modem Service" into tm-dev am: 3050317b am: 8836aae3

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/17230857



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