[automerger skipped] Align the RecoveryActions between...

[automerger skipped] Align the RecoveryActions between DataStallRecoveryManager and Westworld am: 990a8457 am: f0440662 -s ours

am skip reason: Merged-In Ib4dd683e32895109a040a9d822fde8f3df400639 with SHA-1 d371f4f1 is already in history

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



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