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

Change-Id: I26f425bebef75794dd636d200ae2b7683e94380b