[automerger skipped] Merge "make onActiveDataSubId in PhoneStateListener public API" am: dfe984c3fe am: 558a5e2632
am: d7735a130a -s ours
am skip reason: change_id I6e5a5c8273348d822b8f552599784b8e986850bf with SHA1 026c42d752 is in history

Change-Id: I7050435f330e9da4b41b83db2ef0c2dd5257ed86