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

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



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