Revert "Bug 873917 - Use new request pairing message"

This reverts commit 5878d07b9d453847114bbac115bc2715cc480c74.

We need to revert this one for Bluetooth to continue to work with b2g18.
Merge branch 'b2g18-bluetooth' into master-local