Merge "[MS15.1] Remove get/setSubscriberIdMatchRule dependencies" am: d159c1ead7 am: d0c50a49e0 am: 157b8f7a3a am: 5dddce9aa2

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

Change-Id: I3fc3b45ac97b1f3a60cba1f2700fe7dcd73ad43b