Merge "display the phone number from the correct subId" into qt-qpr1-dev
am: 33a1dfcde4

Change-Id: Ibdda031579904d7ccbf2e14c6120e3f5beae0970