Merge "[DSRM] Do recovery actions only after validation passed once." into...

Merge "[DSRM] Do recovery actions only after validation passed once." into tm-dev am: 79c8067f am: f502f116 am: f1c6fe32

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



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