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