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

Change-Id: I233604f68f5722d9b9a1991728f4ba83a776906b