Merge "Revert "Bluetooth: preserve one advertisement slot for GMS core"" into pi-dev