[automerger skipped] Merge "DNC set retry state FAILED if evaluation fails"...

[automerger skipped] Merge "DNC set retry state FAILED if evaluation fails" am: 1a126858 am: 97d409d4 am: fbf01bfd -s ours am: 41edd1fa -s ours am: f28f43de -s ours

am skip reason: Merged-In I6c416400167b5665bf270cc54dee72fc5f87e437 with SHA-1 6fb82d9c is already in history

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

Change-Id: I3ff7eab4f9193646809004800edf554746fa7c9a