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

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



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