Merge "Make SubscriptionManager.getSubId public" am: f9fa9a63bb
am: d88648a475

Change-Id: Ice724f9aff3edeb64b7e8b826e110dfa020a10c8