[automerger skipped] Add flag for recoverability_detection am: fe01791cee -s ours

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

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

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