Bluetooth: Fix merge error

Change-Id: I1caef9fc6e439ed8e8488deeadb64082aa2cd342