resolved conflicts for merge of 8be3e779 to stage-aosp-master

Change-Id: I3b402e3a0f55b236c48dc9f4be1973cbfc0af8a4

app.te

@@ -119,11 +119,6 @@ allow appdomain media_rw_data_file:file { read getattr };
 # Read and write /data/data/com.android.providers.telephony files passed over Binder.
 allow appdomain radio_data_file:file { read write getattr };
 
-# Read and write system app data files passed over Binder.
-# Motivating case was /data/data/com.android.settings/cache/*.jpg for
-# cropping or taking user photos.
-allow untrusted_app system_app_data_file:file { read write getattr };
-
 # Access SDcard via the fuse mount.
 allow appdomain fuse:dir create_dir_perms;
 allow appdomain fuse:file create_file_perms;

untrusted_app.te

@@ -55,6 +55,11 @@ allow untrusted_app shell_data_file:dir r_dir_perms;
 # This line needs to be deleted.
 allow untrusted_app anr_data_file:file r_file_perms;
 
+# Read and write system app data files passed over Binder.
+# Motivating case was /data/data/com.android.settings/cache/*.jpg for
+# cropping or taking user photos.
+allow untrusted_app system_app_data_file:file { read write getattr };
+
 #
 # Rules migrated from old app domains coalesced into untrusted_app.
 # This includes what used to be media_app, shared_app, and release_app.