Merge "Add flag for recoverability_detection" into aosp-main-future