Merge "Attempted fix for navigation bar flicker" into oc-dev am: bbd7dfc0a4

author Jorim Jaggi <jjaggi@google.com>

Tue, 13 Jun 2017 00:38:04 +0000 (00:38 +0000)

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

Tue, 13 Jun 2017 00:38:04 +0000 (00:38 +0000)
author Jorim Jaggi <jjaggi@google.com>
Tue, 13 Jun 2017 00:38:04 +0000 (00:38 +0000)
committer android-build-merger <android-build-merger@google.com>
Tue, 13 Jun 2017 00:38:04 +0000 (00:38 +0000)
diff --cc packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
Simple merge
author	Jorim Jaggi <jjaggi@google.com>
	Tue, 13 Jun 2017 00:38:04 +0000 (00:38 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Tue, 13 Jun 2017 00:38:04 +0000 (00:38 +0000)