Merge "Add Parcelable EmergencyNumber and APIs" am: 379ca95c89
am: e414f5ed16

Change-Id: Ic3f48cc3df90edde8c5ed1941a4e5a6f4e7ab572