Merge "Expose SubscriptionManager.getActiveDataSubscriptionId() as public API" am: 80496e96e4 am: 74c9a01da2
am: 4386a98079

Change-Id: Ic849083c4816c11e52e0586342c1602862fb46e4