Merge "Added disallowed APN types configuration support"

author Jack Yu <jackyu@google.com>

Thu, 8 Aug 2019 04:16:30 +0000 (04:16 +0000)

committer Gerrit Code Review <noreply-gerritcodereview@google.com>

Thu, 8 Aug 2019 04:16:30 +0000 (04:16 +0000)
author Jack Yu <jackyu@google.com>
Thu, 8 Aug 2019 04:16:30 +0000 (04:16 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 8 Aug 2019 04:16:30 +0000 (04:16 +0000)
diff --cc telephony/java/android/telephony/CarrierConfigManager.java
Simple merge
author	Jack Yu <jackyu@google.com>
	Thu, 8 Aug 2019 04:16:30 +0000 (04:16 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Thu, 8 Aug 2019 04:16:30 +0000 (04:16 +0000)