resolved conflicts for merge of bd2e0e7e to lmp-mr1-dev-plus-aosp

Change-Id: I415cba6bdd63b9537b1119db3cc30131a0e2c7f5

bootanim.te

@@ -13,6 +13,9 @@ allow bootanim gpu_device:chr_file rw_file_perms;
 allow bootanim oemfs:dir search;
 allow bootanim oemfs:file r_file_perms;
 
+allow bootanim audio_device:dir r_dir_perms;
+allow bootanim audio_device:chr_file rw_file_perms;
+
 # Audited locally.
 service_manager_local_audit_domain(bootanim)
 auditallow bootanim { service_manager_type -surfaceflinger_service }:service_manager find;