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

Change-Id: Ib0b919b294207cbc7c7b4333f7e6f9989bb44e45