Merge "Fix fingerprint swipe gesture settings for secondary users." into nyc-mr1-dev am: fc5efaeabc
am: 6d395bfd74

Change-Id: I5d36688807cd12a444c856214a60ae55d5343e58