Merge "Unhide the MediaButton receiver API in android.media.AudioManager"