Merge "[MS15.2] Move SUBSCRIBER_ID_MATCH_RULE_* constants to static lib" am: 78d36d7653 am: 6e952001f8

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1930824

Change-Id: I5583e15c57f66c8b7e1a8989a71b80646add8591