Merge "Revert "Add RequestShortAudioDescriptorAction. [1/2]""