Merge "Expose keyguard showing-but-occluded state to launcher" into qt-dev

author Winson Chung <winsonc@google.com>

Tue, 4 Jun 2019 20:56:37 +0000 (20:56 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Tue, 4 Jun 2019 20:56:37 +0000 (20:56 +0000)
author Winson Chung <winsonc@google.com>
Tue, 4 Jun 2019 20:56:37 +0000 (20:56 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 4 Jun 2019 20:56:37 +0000 (20:56 +0000)
diff --cc packages/SystemUI/shared/src/com/android/systemui/shared/system/QuickStepContract.java
Simple merge
author	Winson Chung <winsonc@google.com>
	Tue, 4 Jun 2019 20:56:37 +0000 (20:56 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 4 Jun 2019 20:56:37 +0000 (20:56 +0000)