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

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21516594



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