The values for Public Target Address and Random Target Address were
swapped. This information can be verified in the Bluetooth SIG Assigned
numbers webpage:
https://www.bluetooth.org/en-us/specification/assigned-numbers/generic-access-profile
#define BT_EIR_SERVICE_UUID16 0x14
#define BT_EIR_SERVICE_UUID128 0x15
#define BT_EIR_SERVICE_DATA 0x16
-#define BT_EIR_RANDOM_ADDRESS 0x17
-#define BT_EIR_PUBLIC_ADDRESS 0x18
+#define BT_EIR_PUBLIC_ADDRESS 0x17
+#define BT_EIR_RANDOM_ADDRESS 0x18
#define BT_EIR_GAP_APPEARANCE 0x19
#define BT_EIR_MANUFACTURER_DATA 0xff