Merge "Move to new BluetoothUuid constants"
am: 057472244c

Change-Id: Ie2306b4c5fa8a3bd33704763ff35bc15e126b566