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

[automerger skipped] Merge "Add flag for recoverability_detection" into aosp-main-future am: cce6ac45 -s ours

am skip reason: Merged-In I880256bbcba1126b8d6657dfc77d5f6a0f11e76a with SHA-1 4d4ceec6 is already in history

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



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