[automerger skipped] Merge "Fix ECBM during test mode" am: cd12b81a am:...

[automerger skipped] Merge "Fix ECBM during test mode" am: cd12b81a am: 9e4e6945 -s ours am: 4f3af565 -s ours

am skip reason: Change-Id Ia78a839c5b4a66b605ae25041fd74738ff2ab06b with SHA-1 30b1d925 is in history

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

Change-Id: I345e9446f7cf0f53db999a759049910f320d9b40