Merge "Retry setup after failed and preference changed" into tm-dev am: 58292dc8

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



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