Merge "Floss: connect to LE identity addr if current random is unavailable"

    };

  } else {

    // Floss doesn't support LL Privacy (yet). To expedite ARC testing, always

    // connect to the latest LE random address rather than redesign.

    // connect to the latest LE random address (if available) rather than

    // redesign.

    // TODO(b/235218533): Remove when LL Privacy is implemented.

#if TARGET_FLOSS

    if (!p_dev_rec->ble.cur_rand_addr.IsEmpty()) {

      return {

          .type = BLE_ADDR_RANDOM,

        .bda = p_dev_rec->ble.cur_rand_addr.address,

          .bda = p_dev_rec->ble.cur_rand_addr,

      };

    }

#endif

    return p_dev_rec->ble.identity_address_with_type;

  }