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: a5de98fb am: eb1de36f am: 1abbb5e7

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



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