Merge "make onActiveDataSubId in PhoneStateListener public API"