[automerger skipped] Retry setup after failed and preference changed am:...

[automerger skipped] Retry setup after failed and preference changed am: f9b2a97a am: 0bd5b6fc -s ours am: 5d26bb96 -s ours

am skip reason: Merged-In Iecc9c8ceea0da60f5cbd483c20d269533103bedf with SHA-1 8498e012 is already in history

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



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