[automerger skipped] Merge "Cleaned up the usage of...

[automerger skipped] Merge "Cleaned up the usage of SubscriptionManger.getSubId" into main am: e502678b am: 3f46be81 -s ours am: 7bcc409d -s ours am: cf6c13b8 -s ours am: 7eab7c30 -s ours

am skip reason: Merged-In Id372018a437e72c1b5874dec620b5158337bf43c with SHA-1 443dcaf7 is already in history

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



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