Merge "Make BluetoothGattCallback.onServiceChanged public"