Merge changes I3e646702,I006fe7f1

* changes:
  Consolidate net_test_hf_client_add_record into net_bta_test
  Compiled out [[maybe_unused]] int line_num = 0;