Merge "Grant USB device permission for android.media UID always."