Reconcile com_android_bluetooth_btservice_AdapterService.cpp

Change-Id: Ia4acaf5ad83f3004b88e62aa65a49a5f3903100b