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

Change-Id: Iae701ef4193996601eb5b5187aba60d100208ab4