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

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

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



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