Merge "Streamline OWNERS file under hardware/interfaces/biometrics"