Merge "Re-run detection under more conditions" am: b3a80437

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



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