Merge \"Add handling for fingerprint swipe in gesture settings.\" into nyc-mr1-dev
am: b458f46438

Change-Id: I3ad94884053f7d3788c06ef7d75b4f40f7b46758