Merge "Move biometrics into biometric namespace"

<!-- This is the standard set of features for a biometric face authentication sensor. -->

<permissions>

    <feature name="android.hardware.face" />

    <feature name="android.hardware.biometrics.face" />

</permissions>

<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2018 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->

<!-- This is the standard set of features for a biometric fingerprint sensor. -->

<permissions>

    <feature name="android.hardware.biometrics.fingerprint" />

</permissions>