Merge "Bluetooth: add getDiscoveryEndMillis() call"