Merge "Cleaned up the usage of SubscriptionManger.getSubId" into udc-dev am: a4c95294

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



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