Merge "Don't run fingerprint tests on devices that don't have fingerprint readers. am: 6ef7ab7b66 am: 722257e21c" into oc-dr1-dev-plus-aosp