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

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



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