Merge "[MS15.2] Move SUBSCRIBER_ID_MATCH_RULE_* constants to static lib"