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

Change-Id: I32443204849794f92917a2a2e1098951d5015851