[automerger skipped] Align the RecoveryActions between...

[automerger skipped] Align the RecoveryActions between DataStallRecoveryManager and Westworld am: 990a8457 am: f0440662 -s ours am: e6becee8 -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: I14d8147da2eb27a5b1e32e06ce996afa97410ec5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>