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

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



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