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

Change-Id: Idbb02cb3a561bb745f4e865d29fa014d13953078