Merge "Correct protected broadcast declaration to match AudioManager" into udc-dev