[automerger skipped] Merge "Use TelephonyManager.NETWORK_TYPE_* for IMS APIs"...
[automerger skipped] Merge "Use TelephonyManager.NETWORK_TYPE_* for IMS APIs" am: 65f6df07 am: aa311a99 am: 10f41ced -s ours
am skip reason: Change-Id Id94f6150e4df57e51d170e3771b9fff3d2a994c7 with SHA-1 46ac1d63 is in history
Change-Id: I9dd0f8ccf991bff3b29f5bad2d1a2bf4a76ef03d