Snap for 4623514 from 2a42662968a56aa497e5e890ce598c3e350a4f7b to pi-release

Change-Id: Idcb6295dee06433d619fb326753d9f3a15feb81e
diff --git a/Android.mk b/Android.mk
index 18fa610..fbdb14b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -17,6 +17,7 @@
 include $(CLEAR_VARS)
 
 LOCAL_PACKAGE_NAME := EmergencyInfo
+LOCAL_PRIVATE_PLATFORM_APIS := true
 LOCAL_MODULE_TAGS := eng
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 
@@ -44,4 +45,4 @@
 
 include $(BUILD_PACKAGE)
 
-include $(call first-makefiles-under, $(LOCAL_PATH))
\ No newline at end of file
+include $(call first-makefiles-under, $(LOCAL_PATH))
diff --git a/tests/unit/Android.mk b/tests/unit/Android.mk
index 815e9b0..cdbba0a 100644
--- a/tests/unit/Android.mk
+++ b/tests/unit/Android.mk
@@ -29,6 +29,7 @@
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
 LOCAL_PACKAGE_NAME := EmergencyInfoUnitTests
+LOCAL_PRIVATE_PLATFORM_APIS := true
 LOCAL_COMPATIBILITY_SUITE := device-tests
 LOCAL_CERTIFICATE := platform