Merge "Add new capability TLV and config TLV for supported diagnostics." into tm-mainline-prod