Merge "Bluetooth: advertising improvements" am: 82c9ba9c55 am: e3b71cd572
am: d81df46e80

Change-Id: I7e17eac0305832d69366b565427ec048a7166357