Merge "[MS15.1] Remove get/setSubscriberIdMatchRule dependencies" am: c71df46649 am: 2ed1eefdf8

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

Change-Id: I6336d13c19ad2e7089e68ba30b1da38df957a35d
tree: df618739d8a11bb03dfd240bcfe9259bd2fcf702
  1. core/
  2. framework/
  3. framework-t/
  4. service-t/
  5. services/
  6. tests/