Merge "Rename service android.security.keystore2 to android.system.keystore2."
diff --git a/private/system_server.te b/private/system_server.te
index dcdf501..cadc6cd 100644
--- a/private/system_server.te
+++ b/private/system_server.te
@@ -566,6 +566,9 @@
 # Relabel apk files.
 allow system_server { apk_tmp_file apk_private_tmp_file }:{ dir file } { relabelfrom relabelto };
 allow system_server { apk_data_file apk_private_data_file }:{ dir file } { relabelfrom relabelto };
+# Allow PackageManager to rename file from /data/app-staging folder to /data/app during
+# staged apk install.
+allow system_server { staging_data_file }:{ dir file } { relabelfrom };
 
 # Relabel wallpaper.
 allow system_server system_data_file:file relabelfrom;