Merge "Bypass the test if fingerprint feature is not supported" into oc-dev am: 60e2f125d9
am: 02c5672c40

Change-Id: I05fd9be1827328fe67a89655d58dfb6e055a9ab7