Merge \\\"Default fingerprint swipe to disabled.\\\" into nyc-mr1-dev am: 781f4386dc am: f7f4dfea71
am: 69c6ee6331

Change-Id: I97069317642d3c63057d8b3807adaa0aa2d28c22