Merge "Refactor FingerprintDialog to BiometricDialog" into pi-dev
am: 86ed912f5a

Change-Id: I2582d4770900460a8d37c9d832e9a20583f9adf9