Merge "Separate advertiser from GATT client (1/4)" am: 5f87c4539a am: 40a16ea242 am: 9f341e4e49
am: 8348bd2317

Change-Id: I15b6c8ab87822e5f33bdfabcb8e09e8ce9501cd7