Merge "Remove the Phone registration error notification" into qt-qpr1-dev

author James Lin <jamescflin@google.com>

Wed, 21 Aug 2019 03:14:05 +0000 (03:14 +0000)

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

Wed, 21 Aug 2019 03:14:05 +0000 (03:14 +0000)
author James Lin <jamescflin@google.com>
Wed, 21 Aug 2019 03:14:05 +0000 (03:14 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 21 Aug 2019 03:14:05 +0000 (03:14 +0000)
diff --cc telephony/java/android/telephony/CarrierConfigManager.java
Simple merge
author	James Lin <jamescflin@google.com>
	Wed, 21 Aug 2019 03:14:05 +0000 (03:14 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 21 Aug 2019 03:14:05 +0000 (03:14 +0000)