Merge "Change the label of CombinedBiometricProfileSettingsActivity." into udc-dev