[automerger skipped] Merge "Add support to retry for DDS switch failures" am: 2f102d49 am: 3bda8bdd am: 0b0aa8ad -s ours

am skip reason: skip tag Change-Id I34021984b0245d53ccce80dd986434ff1539f645 with SHA-1 12f290d9 is already in history

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

Change-Id: Ib28e3fa3369d26338f51e15615baf8b8e2023155