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

Change-Id: I4106b0a3e519c2a89db29196edfe05a6a515125d