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

Change-Id: Iecac7b32f88a2b4d8d3236b2e571dde832b49044