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

Change-Id: I54df9c355ac951d40b2d8e865d5f36f8875ce71f