Merge "Fingerprint swipe settings and suggestions should not show if hardware unavailable" into oc-dr1-dev am: 5e707ccb3d -s ours am: 7edaa60315 -s ours
am: 5f301cb003 -s ours
Change-Id: I82c629a9faa1f94e038a085227172a035ca84ef2
This commit is contained in: