@hide ACCESS_CACHE_FILESYSTEM and MOVE_PACKAGE

Bug: b/2553489
Change-Id: I681b3f9a243777b931298cc93c9d34c8d7eae0f2
diff --git a/api/current.xml b/api/current.xml
index 21b75eb..58b9c17 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -34,17 +34,6 @@
  visibility="public"
 >
 </constructor>
-<field name="ACCESS_CACHE_FILESYSTEM"
- type="java.lang.String"
- transient="false"
- volatile="false"
- value="&quot;android.permission.ACCESS_CACHE_FILESYSTEM&quot;"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
 <field name="ACCESS_CHECKIN_PROPERTIES"
  type="java.lang.String"
  transient="false"
@@ -716,17 +705,6 @@
  visibility="public"
 >
 </field>
-<field name="MOVE_PACKAGE"
- type="java.lang.String"
- transient="false"
- volatile="false"
- value="&quot;android.permission.MOVE_PACKAGE&quot;"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
 <field name="PERSISTENT_ACTIVITY"
  type="java.lang.String"
  transient="false"
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 9e3e8a4..db71b21b 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -1031,7 +1031,8 @@
         android:description="@string/permdesc_deletePackages"
         android:protectionLevel="signatureOrSystem" />
 
-    <!-- Allows an application to move location of installed package. -->
+    <!-- Allows an application to move location of installed package.
+         @hide -->
     <permission android:name="android.permission.MOVE_PACKAGE"
         android:label="@string/permlab_movePackage"
         android:description="@string/permdesc_movePackage"
@@ -1207,7 +1208,8 @@
         android:permissionGroup="android.permission-group.SYSTEM_TOOLS"
         android:protectionLevel="signatureOrSystem" />
 
-    <!-- Allow an application to read and write the cache partition. -->
+    <!-- Allow an application to read and write the cache partition.
+         @hide -->
     <permission android:name="android.permission.ACCESS_CACHE_FILESYSTEM"
         android:label="@string/permlab_cache_filesystem"
         android:description="@string/permdesc_cache_filesystem"