Merge "Separate advertiser from GATT client (3/4)"
am: 7a3148bc41

Change-Id: I8cc7558fee5812ff3ec1e4aed1cb52ccac7cd294