Merge "Default-off FP Swipe am: 8f5de15ba1 am: e4fed2ee05" into oc-mr1-dev-plus-aosp
am: fbde89ea2c
Change-Id: I7f0c54717587b3d8491a29aaade3a50c7df04d66
This commit is contained in: