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

Change-Id: Ic3461b98449636cfc125890f255b1332d0ef5132