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

Change-Id: Ida9690580f2c1c5ab35cb34e194907de6505085b