Merge "Clarify API doc for BluetoothGattServer::addService" am: f493c66f39
am: 478b35a2fd

Change-Id: Ia1d0ea90ceff6c0e39062de5e4cc000d76d51f7a