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

Change-Id: Idd5369b25b366b410b5c3cc1bb3b6a5649ac044f