Merge "Add @hide for  the VENDOR_SPECIFIC_HEADSET_INTENT"