Snap for 4620899 from c6f0cc4802896c98ae03ec64dec25febd1dd1bd3 to pi-release

Change-Id: I157c7feb0bfcc10e68a59c8229d744c529542cd2
diff --git a/Android.mk b/Android.mk
index e6a9f2d..a779bb0 100644
--- a/Android.mk
+++ b/Android.mk
@@ -6,6 +6,7 @@
 LOCAL_JAVA_LIBRARIES := telephony-common
 
 LOCAL_PACKAGE_NAME := CarrierConfig
+LOCAL_PRIVATE_PLATFORM_APIS := true
 LOCAL_CERTIFICATE := platform
 LOCAL_PRIVILEGED_MODULE := true
 
diff --git a/tests/Android.mk b/tests/Android.mk
index e5a4480..44ffd32 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -9,6 +9,7 @@
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
 LOCAL_PACKAGE_NAME := CarrierConfigTests
+LOCAL_PRIVATE_PLATFORM_APIS := true
 LOCAL_COMPATIBILITY_SUITE := device-tests
 LOCAL_CERTIFICATE := platform