Add getDeviceId to PhoneInterfaceManager to give id independent of SubInfo.
Add getDeviceId to PhoneInterfaceManager to give id independent of SubInfo.

Bug: 18780202
Change-Id: I35a2a9e15ec90cac879320c0c1005f065f1b4f0d

md5555/android_packages_services_Telephony