[automerger skipped] Add flag for recoverability_detection am: 9a47a3f9 -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: Ieba166508ced9241e30fe69ae79bcc3ba8375e30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>