[automerger skipped] Re-run detection under more conditions am: 169ca55d am: 4f39b8b1 -s ours

am skip reason: Merged-In I444ce448029c09a99e41d06bb7a478958f849d15 with SHA-1 05810cf5 is already in history

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



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