No longer show disambig when calling SmsManager#getSubId
am: 26b242f75e

Change-Id: I6d0487c356d64868393f5d20375ca91efbe31c53