Merge "Do not show lock screen when SIM is removed" into qt-dev

author Lucas Dupin <dupin@google.com>

Fri, 19 Apr 2019 15:54:01 +0000 (15:54 +0000)

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

Fri, 19 Apr 2019 15:54:01 +0000 (15:54 +0000)
author Lucas Dupin <dupin@google.com>
Fri, 19 Apr 2019 15:54:01 +0000 (15:54 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 19 Apr 2019 15:54:01 +0000 (15:54 +0000)
diff --cc packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
Simple merge
author	Lucas Dupin <dupin@google.com>
	Fri, 19 Apr 2019 15:54:01 +0000 (15:54 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 19 Apr 2019 15:54:01 +0000 (15:54 +0000)