Merge "Move getPhoneCount implementation back to TelephonyManager." am: 72cc8f616e
am: ce573a31ff

Change-Id: I5cbae1d1edfc6628ee2aa7509b796c931c57ec15