Merge "make onActiveDataSubId in PhoneStateListener public API"
am: dfe984c3fe

Change-Id: Ic385f5372535220bbeda6351974b22081a2e8b30