Merge "Fingerprint swipe settings and suggestions should not show if hardware unavailable" into oc-dr1-dev
am: 5e707ccb3d  -s ours

Change-Id: Ia0a0f8fff5bec512656229aaf2d81e0952760c4e