Merge "Delay dialing normal routing emergency number in airplane mode" into udc-dev am: 4dbad2e613

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telephony/+/22381325

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