Merge "Add TEST_BIOMETRIC permission to permission2 android_manifest"