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