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

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

Change-Id: I8f6c6fca2d3d980f0fbd08d3a3b9fefa8b2393ed