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

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

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



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