Merge "Delay dialing normal routing emergency number in airplane mode" into...

Merge "Delay dialing normal routing emergency number in airplane mode" into udc-dev am: 66fd0fe4 am: 85aae1ff

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/22384683



Change-Id: I904706091847d2c088eeced17a5486e4825c802c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>