[automerger skipped] Merge "make onActiveDataSubId in PhoneStateListener...
[automerger skipped] Merge "make onActiveDataSubId in PhoneStateListener public API" am: eb5db7d7 am: 1991c72b
am: 3cfc15ed -s ours
am skip reason: change_id I3fbd62bac3a07b9d5bc1925e4babf5b54d18a13b with SHA1 7c773837 is in history
Change-Id: Ic887de726b9b3d3abcb75a92f34d59d6506e94d5