Merge "Revert "Bluetooth: Avoid re-authentication for secure high connections""