Merge "Merge "Add null check in AuthBiometricView#onConfigurationChange" into tm-qpr-dev am: fb599cdf14 am: 92cd3305dd" into udc-dev