[automerger skipped] Merge "Add flag for recoverability_detection" into main...

[automerger skipped] Merge "Add flag for recoverability_detection" into main am: 0a87e803 -s ours am: 4fe1e4da -s ours

am skip reason: Merged-In I555f5edb76ddc107c071b8b4c6909ef54ecf46eb with SHA-1 9a47a3f9 is already in history

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



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