Merge "Make SubscriptionManager.isValidSubscriptionId public"
am: 241aa86ed6

Change-Id: Ibbb69ba6e01d21bdd414afc73a90a965244eeae6