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

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

Change-Id: I7e4e0f1835516e00d180c42807b1cc887710cda3