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

Merge "Re-run detection under more conditions" am: b3a80437 am: bef08f80 am: 652562d9 am: 80945074 am: 073e0d39

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



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