Merge "MMS APIs rely on resolveSubscriptionForOperation()" am: e0ae42884d am: 12d3218ef3 am: b7fd7db377

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

Change-Id: I3eeb865f1a9af486833a7c41064e11f71e75f30b