Merge "BT: Always update service object in BluetoothDevice Class" into android-framework.lnx.2.0-dev