Merge "Bluetooth: preserve one advertisement slot for GMS core" am: 00cc1847d3 am: 922ae0237f
am: 158344f78a

Change-Id: Ia9f4c8845bb59509482ac0af8a569026fd1d7101