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

Change-Id: I9f587f6720aa09b1d39b8fe0c3a01c47fc74a3af