Merge "Remove mUsePbapPce and mUseMapClient"