Merge "Add android.hardware.biometrics.common"