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

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

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

Change-Id: Id4850de4af909cfa426dfca1369ccf15fbecbf7b