Merge "Add aconfig for biometrics flags" into main