[automerger skipped] Merge "Add shell command to trigger ECBM mode Fix EmergencyCallBackMode dialog Overlaid issue" into rvc-qpr-dev-plus-aosp am: 2aa049b369 -s ours

am skip reason: Change-Id I731531d2d717e18e17f035262cd92d58d1f39ff9 with SHA-1 479dd9eb1c is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaf0619f104f3135303eb30e97ebc53363fbdf6d3