Merge "Make SubscriptionManager.getSubId public"
am: f9fa9a63bb

Change-Id: I1dbc088c8668df43a18741a58b9c32ef5eae1fc9