Merge "Remove listenUsingEncryptedRfcommOn & listenUsingScoOn"