Merge "[MS15.1] Remove get/setSubscriberIdMatchRule dependencies" am: d159c1ead7

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

Change-Id: Id10207685a3a4f815cf3be9233af051ac090c0ba