Merge "FingerprintSettings for non-owner should respond to fingerprint touches" into oc-dev
am: 89628f8809

Change-Id: I01aca4286f0039fee5526c2a59c5d89b41da027a