Merge changes I2598cce2,I64525b73

* changes:
  Remove icon vertical padding from small dialog height calculation
  Dismiss the BiometricPrompt upon Intent.ACTION_CLOSE_SYSTEM_DIALOGS