Merge "Partial revert of ag/7508382 to retain back button responsiveness in Biomteric...

author Kevin Chyn <kchyn@google.com>

Wed, 5 Jun 2019 22:22:52 +0000 (15:22 -0700)

committer android-build-merger <android-build-merger@google.com>

Wed, 5 Jun 2019 22:22:52 +0000 (15:22 -0700)
author Kevin Chyn <kchyn@google.com>
Wed, 5 Jun 2019 22:22:52 +0000 (15:22 -0700)
committer android-build-merger <android-build-merger@google.com>
Wed, 5 Jun 2019 22:22:52 +0000 (15:22 -0700)
diff --cc packages/SystemUI/src/com/android/systemui/biometrics/BiometricDialogView.java
Simple merge
author	Kevin Chyn <kchyn@google.com>
	Wed, 5 Jun 2019 22:22:52 +0000 (15:22 -0700)
committer	android-build-merger <android-build-merger@google.com>
	Wed, 5 Jun 2019 22:22:52 +0000 (15:22 -0700)