Merge \"drmserver: read locked ringtones\" into nyc-mr1-dev

am: eba62067

Change-Id: I1e732752d741023a82366a2c4a5d72a86976711c

drmserver.te

@@ -41,6 +41,7 @@ r_dir_file(drmserver, media_rw_data_file)
 # Read resources from open apk files passed over Binder.
 allow drmserver apk_data_file:file { read getattr };
 allow drmserver asec_apk_file:file { read getattr };
+allow drmserver ringtone_file:file { read getattr };
 
 # Read /data/data/com.android.providers.telephony files passed over Binder.
 allow drmserver radio_data_file:file { read getattr };