Merge "Revert "Bluetooth: preserve one advertisement slot for GMS core"" into pi-dev am: 5bdf063537
am: 31595b3156

Change-Id: I186a9aafc85d7fc74e7eaef259416552a974d6c3