Merge "Revert "Fix failure to open AVRCP input device due to EPERM.""