[automerger skipped] Merge "Update EmergencyNumber API docs to indicate they...
[automerger skipped] Merge "Update EmergencyNumber API docs to indicate they can throw." into rvc-dev am: ffcfaa74 -s ours am: 95eeb03d -s ours
am skip reason: Change-Id Ic6bcd32ab93a97a8d075e720acb5fc17612a3984 with SHA-1 031f56f2 is in history
Change-Id: I1e834e7ed75c246993a2dc18fe8cc4118a23249b