Merge "Use saved ECBM config in SIM locked state" into 24D1-dev am: a6f46a2b

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



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