resolved conflicts for merge of 0a20b57f to lmp-dev-plus-aosp

Change-Id: I6a0d56c23888535964e1559cb8ad63fedd27db47

drmserver.te

@@ -47,6 +47,9 @@ allow drmserver radio_data_file:file { read getattr };
 
 allow drmserver drmserver_service:service_manager add;
 
+# /oem access
+allow drmserver oemfs:file r_file_perms;
+
 # Audited locally.
 service_manager_local_audit_domain(drmserver)
 auditallow drmserver {

mediaserver.te

@@ -80,6 +80,9 @@ allow mediaserver tee:unix_stream_socket connectto;
 
 allow mediaserver mediaserver_service:service_manager add;
 
+# /oem access
+allow mediaserver oemfs:file r_file_perms;
+
 # Audited locally.
 service_manager_local_audit_domain(mediaserver)
 auditallow mediaserver {