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

Change-Id: I0cc39d08fdef8637e156414e3ef4e669a01f921f