Merge "Merge "Default-off FP Swipe" into oc-dr1-dev am: 76303759c4 am: 95faeeb803" into oc-mr1-dev-plus-aosp