Merge "Expose onEmergencyNumberListChanged, semantics change"