Merge "If data switched to grouped CBRS subscription, show its provider name." into...

author Xiangyu/Malcolm Chen <refuhoo@google.com>

Tue, 16 Apr 2019 22:31:20 +0000 (22:31 +0000)

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

Tue, 16 Apr 2019 22:31:20 +0000 (22:31 +0000)
author Xiangyu/Malcolm Chen <refuhoo@google.com>
Tue, 16 Apr 2019 22:31:20 +0000 (22:31 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 16 Apr 2019 22:31:20 +0000 (22:31 +0000)
diff --cc packages/SystemUI/src/com/android/keyguard/CarrierTextController.java
Simple merge
author	Xiangyu/Malcolm Chen <refuhoo@google.com>
	Tue, 16 Apr 2019 22:31:20 +0000 (22:31 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 16 Apr 2019 22:31:20 +0000 (22:31 +0000)