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: c78fc0b1 am: c21d34a3

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



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