Merge "Revert "Unhide enable_apps carrier config key."" into pi-dev

author Meng Wang <mewan@google.com>

Tue, 27 Mar 2018 22:06:36 +0000 (22:06 +0000)

committer android-build-merger <android-build-merger@google.com>

Tue, 27 Mar 2018 22:06:36 +0000 (22:06 +0000)
author Meng Wang <mewan@google.com>
Tue, 27 Mar 2018 22:06:36 +0000 (22:06 +0000)
committer android-build-merger <android-build-merger@google.com>
Tue, 27 Mar 2018 22:06:36 +0000 (22:06 +0000)
diff --cc api/current.txt
Simple merge
diff --cc telephony/java/android/telephony/CarrierConfigManager.java
Simple merge
author	Meng Wang <mewan@google.com>
	Tue, 27 Mar 2018 22:06:36 +0000 (22:06 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Tue, 27 Mar 2018 22:06:36 +0000 (22:06 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
telephony/java/android/telephony/CarrierConfigManager.java	patch \|	diff1 \|	diff2 \|	blob \| history