Merge "Update emergency number authority name to be more generic" into sc-dev am: 45cbe9b7 am: 89477dba

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13618909

Change-Id: I670edf9f3a6bcf081c5a62ab954eb3c04084ea24