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

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

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