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

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

Change-Id: Ifc1ed3a7d0e100dbd567c6809a07a8a38012ed60