Merge "Align the RecoveryActions between DataStallRecoveryManager and Westworld" into tm-dev am: 82c6e424d2

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17254783

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